projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e17fa59 5ecc8ce)
bitkeeper revision 1.1109 (40fba255_6K-mdDlFfWu0qHz1y5yEg)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Mon, 19 Jul 2004 10:28:37 +0000 (10:28 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Mon, 19 Jul 2004 10:28:37 +0000 (10:28 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-ptrw

1  2 
xen/arch/x86/memory.c patch | diff1 | diff2 | blob | history
xen/arch/x86/traps.c patch | diff1 | diff2 | blob | history
xen/include/asm-x86/mm.h patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/memory.c
Simple merge
diff --cc xen/arch/x86/traps.c
Simple merge
diff --cc xen/include/asm-x86/mm.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.